Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 17 Jan 2010 00:12:59 +0000 (00:12 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 17 Jan 2010 00:12:59 +0000 (00:12 +0000)

Trivial merge